Update docker-library images #3446
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- `docker`: add `ppc64le` support (still waiting on Alpine multiarch) - `hello-seattle`: update Windows example (docker-library/hello-world#36) - `hello-world`: update Windows example (docker-library/hello-world#36) - `hola-mundo`: update Windows example (docker-library/hello-world#36)
Diff:diff --git a/docker_test/Dockerfile b/docker_test/Dockerfile
index ddfc3b9..a819f70 100644
--- a/docker_test/Dockerfile
+++ b/docker_test/Dockerfile
@@ -23,6 +23,7 @@ RUN set -ex; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
x86_64) dockerArch='x86_64' ;; \
+ ppc64le) dockerArch='ppc64le' ;; \
s390x) dockerArch='s390x' ;; \
*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
esac; \
diff --git a/hello-seattle_nanoserver/hello.txt b/hello-seattle_nanoserver/hello.txt
index 956b472..5d52b8a 100644
--- a/hello-seattle_nanoserver/hello.txt
+++ b/hello-seattle_nanoserver/hello.txt
@@ -10,8 +10,8 @@ To generate this message, Docker took the following steps:
4. The Docker daemon streamed that output to the Docker client, which sent it
to your terminal.
-To try something more ambitious, you can run a Nano Server container with:
- $ docker run -it microsoft/nanoserver powershell
+To try something more ambitious, you can run a Windows Server container with:
+ PS C:\> docker run -it microsoft/windowsservercore powershell
Share images, automate workflows, and more with a free Docker ID:
https://cloud.docker.com/
diff --git a/hello-world_nanoserver/hello.txt b/hello-world_nanoserver/hello.txt
index 90ebfb1..557042d 100644
--- a/hello-world_nanoserver/hello.txt
+++ b/hello-world_nanoserver/hello.txt
@@ -10,8 +10,8 @@ To generate this message, Docker took the following steps:
4. The Docker daemon streamed that output to the Docker client, which sent it
to your terminal.
-To try something more ambitious, you can run a Nano Server container with:
- $ docker run -it microsoft/nanoserver powershell
+To try something more ambitious, you can run a Windows Server container with:
+ PS C:\> docker run -it microsoft/windowsservercore powershell
Share images, automate workflows, and more with a free Docker ID:
https://cloud.docker.com/
diff --git a/hola-mundo_nanoserver/hello.txt b/hola-mundo_nanoserver/hello.txt
index cb56b4a..a8b9086 100644
--- a/hola-mundo_nanoserver/hello.txt
+++ b/hola-mundo_nanoserver/hello.txt
@@ -10,8 +10,8 @@ To generate this message, Docker took the following steps:
4. The Docker daemon streamed that output to the Docker client, which sent it
to your terminal.
-To try something more ambitious, you can run a Nano Server container with:
- $ docker run -it microsoft/nanoserver powershell
+To try something more ambitious, you can run a Windows Server container with:
+ PS C:\> docker run -it microsoft/windowsservercore powershell
Share images, automate workflows, and more with a free Docker ID:
https://cloud.docker.com/ |
|
Build test of #3446; a1b2b3b ( $ bashbrew build docker:17.09.0-ce-rc1
Building bashbrew/cache:fa90082bc15cb306ef37567521798c0aa12190ffaff1714e1361c7509163502d (docker:17.09.0-ce-rc1)
Tagging docker:17.09.0-ce-rc1
Tagging docker:17.09.0-ce
Tagging docker:17.09.0
Tagging docker:17.09-rc
Tagging docker:rc
Tagging docker:test
$ test/run.sh docker:17.09.0-ce-rc1
testing docker:17.09.0-ce-rc1
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:17.09.0-ce-rc1-dind
Building bashbrew/cache:17dd0006a06fa2ea8c88da07389125cc9083ceb8c05de99d079f5e21801ac7d0 (docker:17.09.0-ce-rc1-dind)
Tagging docker:17.09.0-ce-rc1-dind
Tagging docker:17.09.0-ce-dind
Tagging docker:17.09.0-dind
Tagging docker:17.09-rc-dind
Tagging docker:rc-dind
Tagging docker:test-dind
$ test/run.sh docker:17.09.0-ce-rc1-dind
testing docker:17.09.0-ce-rc1-dind
'utc' [1/6]...passed
'cve-2014--shellshock' [2/6]...passed
'no-hard-coded-passwords' [3/6]...passed
'override-cmd' [4/6]...passed
'docker-dind' [5/6]...passed
'docker-registry-push-pull' [6/6]...passed
$ bashbrew build docker:17.09.0-ce-rc1-git
Building bashbrew/cache:d6e5502454b359f91143fe037d9ae6500fb60e275865c978fcfcf348f3358c3f (docker:17.09.0-ce-rc1-git)
Tagging docker:17.09.0-ce-rc1-git
Tagging docker:17.09.0-ce-git
Tagging docker:17.09.0-git
Tagging docker:17.09-rc-git
Tagging docker:rc-git
Tagging docker:test-git
$ test/run.sh docker:17.09.0-ce-rc1-git
testing docker:17.09.0-ce-rc1-git
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:17.07.0-ce
Using bashbrew/cache:14efa60ae53d6d1ef447fc6ed09c62b43499423ad16bd1de97e53f2a920ad1ae (docker:17.07.0-ce)
Tagging docker:17.07.0-ce
Tagging docker:17.07.0
Tagging docker:17.07
Tagging docker:17
Tagging docker:edge
Tagging docker:latest
$ test/run.sh docker:17.07.0-ce
testing docker:17.07.0-ce
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:17.07.0-ce-dind
Using bashbrew/cache:557e26e3ebcc179d44c5b63143a936df71e526289f3438ad1b15dd188b1d2b73 (docker:17.07.0-ce-dind)
Tagging docker:17.07.0-ce-dind
Tagging docker:17.07.0-dind
Tagging docker:17.07-dind
Tagging docker:17-dind
Tagging docker:edge-dind
Tagging docker:dind
$ test/run.sh docker:17.07.0-ce-dind
testing docker:17.07.0-ce-dind
'utc' [1/6]...passed
'cve-2014--shellshock' [2/6]...passed
'no-hard-coded-passwords' [3/6]...passed
'override-cmd' [4/6]...passed
'docker-dind' [5/6]...passed
'docker-registry-push-pull' [6/6]...passed
$ bashbrew build docker:17.07.0-ce-git
Using bashbrew/cache:be48295c4ea98a7305f38cb32a96b0fa9ed48e1a4518a26d0fa5809d07e2e06c (docker:17.07.0-ce-git)
Tagging docker:17.07.0-ce-git
Tagging docker:17.07.0-git
Tagging docker:17.07-git
Tagging docker:17-git
Tagging docker:edge-git
Tagging docker:git
$ test/run.sh docker:17.07.0-ce-git
testing docker:17.07.0-ce-git
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:17.06.2-ce
Using bashbrew/cache:a461775cce27bd3aefccaa44e3f3b2fb6b9d77a7b6d0a83ba4a938c10e240458 (docker:17.06.2-ce)
Tagging docker:17.06.2-ce
Tagging docker:17.06.2
Tagging docker:17.06
Tagging docker:stable
$ test/run.sh docker:17.06.2-ce
testing docker:17.06.2-ce
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:17.06.2-ce-dind
Using bashbrew/cache:93f292aaad37a0dadb214645cc66d88052bdf50bd4d1b4ea07ed318d464d03d4 (docker:17.06.2-ce-dind)
Tagging docker:17.06.2-ce-dind
Tagging docker:17.06.2-dind
Tagging docker:17.06-dind
Tagging docker:stable-dind
$ test/run.sh docker:17.06.2-ce-dind
testing docker:17.06.2-ce-dind
'utc' [1/6]...passed
'cve-2014--shellshock' [2/6]...passed
'no-hard-coded-passwords' [3/6]...passed
'override-cmd' [4/6]...passed
'docker-dind' [5/6]...passed
'docker-registry-push-pull' [6/6]...passed
$ bashbrew build docker:17.06.2-ce-git
Using bashbrew/cache:b4d2c4679c30d587b70ed78ce681a1c7894cd4067521bb1ac4beb4bfe7c4dce6 (docker:17.06.2-ce-git)
Tagging docker:17.06.2-ce-git
Tagging docker:17.06.2-git
Tagging docker:17.06-git
Tagging docker:stable-git
$ test/run.sh docker:17.06.2-ce-git
testing docker:17.06.2-ce-git
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build hello-seattle:linux
Using bashbrew/cache:bf992b01fb16e687d78101400644e32516fbbdde95780d5b0886e329c7f5e213 (hello-seattle:linux)
Tagging hello-seattle:linux
$ test/run.sh hello-seattle:linux
testing hello-seattle:linux
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed
$ bashbrew build hello-seattle:nanoserver
skipping "hello-seattle:nanoserver" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh hello-seattle:nanoserver
testing hello-seattle:nanoserver
image does not exist!
$ bashbrew build hello-world:linux
Using bashbrew/cache:e8933bcab3e8ad7bdd9cb2eac14a3a2a76b3a93f091476f3c3b5c232fd2e23eb (hello-world:linux)
Tagging hello-world:linux
$ test/run.sh hello-world:linux
testing hello-world:linux
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed
$ bashbrew build hello-world:nanoserver
skipping "hello-world:nanoserver" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh hello-world:nanoserver
testing hello-world:nanoserver
image does not exist!
$ bashbrew build hola-mundo:linux
Using bashbrew/cache:6e0dc840e94de89d11578ec8ee9333f7bf77478c9c985c4180b77afe0e7ed5ea (hola-mundo:linux)
Tagging hola-mundo:linux
$ test/run.sh hola-mundo:linux
testing hola-mundo:linux
'cve-2014--shellshock' [1/2]...passed
'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed
$ bashbrew build hola-mundo:nanoserver
skipping "hola-mundo:nanoserver" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh hola-mundo:nanoserver
testing hola-mundo:nanoserver
image does not exist!
The following images failed at least one test:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
docker: addppc64lesupport (still waiting on Alpine multiarch; multi-arch alpine image support gliderlabs/docker-alpine#304)hello-seattle: update Windows example (Update Windows with a PowerShell prompt and windowsservercore hello-world#36)hello-world: update Windows example (Update Windows with a PowerShell prompt and windowsservercore hello-world#36)hola-mundo: update Windows example (Update Windows with a PowerShell prompt and windowsservercore hello-world#36)